feat: Swap js integration #320

m30m · 2025-01-10T01:06:01Z

No description provided.

Tiltfile

.pre-commit-config.yaml

sdk/js/src/const.ts

m30m · 2025-01-10T01:08:44Z

sdk/js/src/svm.ts

+  const expressRelayMetadata = getExpressRelayMetadataPda(chainId);
+  const svmConstants = SVM_CONSTANTS[chainId];
+
+  const tokenProgramInput = TOKEN_PROGRAM_ID;


get from server

danimhr

I reviewed the server parts. You may need to merge with main. There is a bunch of other changes merged recently.

.pre-commit-config.yaml

auction-server/api-types/src/opportunity.rs

danimhr · 2025-01-10T09:11:14Z

auction-server/src/auction/service/verification.rs

+                        e
+                    ))
+                })?;
+                let expected_router_fee_receiver_ta = Pubkey::find_program_address(


We should use this address for creating the permission key

danimhr · 2025-01-10T09:28:42Z

auction-server/src/auction/service/verification.rs

-                    //         ))
-                    //     },
-                    // )?,
+                    router: self.config.chain_config.wallet_program_router_account,


if we use the router_fee_receiver_ta to create the permission key, we don't need to do these checks. actually the permission key will be invalid if the receiver_ta account does not match with what we expect.

this is a good point, we should probably include the router in the permission_key construction in get_quote_permission_key. that's an easy fix, we can mark it as a TODO (or you can add it here after merging main)

auction-server/src/auction/service/verification.rs

auction-server/src/opportunity/api.rs

Tiltfile

auction-server/src/auction/service/verification.rs

anihamde · 2025-01-10T10:46:26Z

auction-server/src/auction/service/verification.rs

+                        e
+                    ))
+                })?;
+                let expected_router_fee_receiver_ta = Pubkey::find_program_address(


i think the whole point of making the router fee receiver ta generic as opposed to constraining it to be the ATA was so that routers could provide arbitrary token accounts

also the wallet_program_router_account is no longer in the config

anihamde · 2025-01-10T10:49:53Z

auction-server/src/auction/service/verification.rs

-                    //         ))
-                    //     },
-                    // )?,
+                    router: self.config.chain_config.wallet_program_router_account,


this is a good point, we should probably include the router in the permission_key construction in get_quote_permission_key. that's an easy fix, we can mark it as a TODO (or you can add it here after merging main)

sdk/js/src/const.ts

sdk/js/src/svm.ts

anihamde · 2025-01-10T11:25:04Z

sdk/js/src/svm.ts

+      ),
+      tokenProgramOutput,
+      mintOutput,
+      routerFeeReceiverTa: getAssociatedTokenAddress(


this is not necessarily the ATA. the router account here will be the token account that the referrer wants the SPL fee token to be sent to, so you can just use that

anihamde · 2025-01-10T11:28:25Z

tilt-scripts/svm/test_swap.py

@@ -0,0 +1,95 @@
+import argparse


i think it would be easier (and better) to start writing the tilt scripts in JS? i think you could probably write this whole script more flexibly (using SDK methods rather than writing endpoints and payloads manually) in JS

agreed, probably the simple ui we are going to make can be reused here too. But for the sake of wrapping this PR, I left it as it

sdk/js/src/examples/simpleSearcherLimo.ts

sdk/js/src/svm.ts

danimhr · 2025-01-10T10:57:15Z

sdk/js/src/svm.ts

+      expressRelayMetadata,
+      searcher,
+      trader: swapOpportunity.userWalletAddress,
+      searcherInputTa: getAssociatedTokenAddress(


Maybe it's better to make it optional variable?
If not exist set to getAssociatedTokenAddress otherwise, use the input variable

danimhr · 2025-01-10T10:57:21Z

sdk/js/src/svm.ts

+        mintInput,
+        tokenProgramInput
+      ),
+      searcherOutputTa: getAssociatedTokenAddress(


danimhr · 2025-01-10T11:00:20Z

sdk/js/src/svm.ts

+      ),
+      tokenProgramOutput,
+      mintOutput,
+      routerFeeReceiverTa: getAssociatedTokenAddress(


Maybe it's better to make it Ata inside the program?

auction-server/src/auction/entities/bid.rs

danimhr · 2025-01-15T15:36:35Z

auction-server/src/opportunity/service/get_opportunities.rs

 impl<T: ChainType> Service<T> {
+    pub async fn get_opportunity_by_id(


better name here is get_live_opportunity_by_id

auction-server/src/auction/service/verification.rs

auction-server/src/opportunity/entities/opportunity_svm.rs

auction-server/src/opportunity/repository/models.rs

auction-server/src/opportunity/service/get_opportunities.rs

auction-server/api-types/src/bid.rs

auction-server/api-types/src/opportunity.rs

auction-server/src/opportunity/api.rs

auction-server/src/opportunity/entities/opportunity_svm.rs

auction-server/src/auction/service/verification.rs

anihamde · 2025-01-17T10:43:23Z

sdk/js/src/examples/simpleSearcherSvm.ts

   * The transaction in this bid transfers assets from the searcher's wallet to fulfill the limit order.
   * @param opportunity The SVM opportunity to bid on.
   * @returns The generated bid object.
   */
-  async generateBid(opportunity: OpportunitySvm): Promise<BidSvm> {
+  async generateBidLimo(opportunity: OpportunitySvmLimo): Promise<BidSvm> {


nit, i still prefer limo and swap examples to live in two different files bc they are completely different functions

sdk/js/src/types.ts

auction-server/src/auction/service/verification.rs

anihamde · 2025-01-17T16:13:00Z

auction-server/src/auction/service/verification.rs

-                        input_token:  opp_sell_token.clone(),
-                        output_token: opp_buy_token.token,
+                    (_, 0) => QuoteTokens::OutputTokenSpecified {
+                        output_token: opp_sell_token.clone(),


tiniest of nits, can you order input_token first for consistency? or output_token first is fine but let's just follow one order throughout

anihamde · 2025-01-17T16:16:12Z

auction-server/src/auction/service/verification.rs

@@ -483,6 +494,188 @@ impl Service<Svm> {
        }
    }

+    async fn check_svm_swap_bid_fields(


i like packaging the validations all here, you could pass in SwapAccounts here to cut the redundancy, but i think it's fine this way too

I think it's the responsibility of this function to extract such info.

anihamde · 2025-01-17T16:25:23Z

auction-server/src/auction/service/verification.rs

+            .expect("Swap opportunity buy tokens must not be empty");
+        match (opp_sell_token.amount, opp_buy_token.amount) {
+            (0, _) => QuoteTokens::InputTokenSpecified {
+                output_token: opp_sell_token.token,


i think output_token is the buy_token from the standpoint of the searcher

m30m added 3 commits January 9, 2025 19:32

feat: initial js sdk for swap

4326882

Merge branch 'main' into swap-js-integration

6f06542

cleanup

d7eee0a

m30m commented Jan 10, 2025

View reviewed changes

danimhr reviewed Jan 10, 2025

View reviewed changes

anihamde reviewed Jan 10, 2025

View reviewed changes

danimhr reviewed Jan 10, 2025

View reviewed changes

m30m added 6 commits January 10, 2025 09:57

Merge branch 'main' into swap-js-integration

9428900

Merge branch 'main' into swap-js-integration

b074cbf

test

221015b

t

a65ae6c

test

30f5f0e

fix pre-commit 1

8a587d8

m30m force-pushed the swap-js-integration branch from 3589fc3 to 8a587d8 Compare January 15, 2025 14:32

m30m commented Jan 15, 2025

View reviewed changes

auction-server/src/auction/entities/bid.rs Outdated Show resolved Hide resolved

danimhr reviewed Jan 15, 2025

View reviewed changes

m30m added 12 commits January 15, 2025 12:09

fix

3058548

better naming

fcfabc1

rename envs and more structure

a11f4fa

Better error messages

9725a2b

rename scripts

9b6a578

Merge branch 'main' into swap-js-integration

2cda7d3

Use mint token programs received from the server

becaae6

Check token programs

a3eab42

Drop the Kamino, just Swap, it is cleaner

8cf0e17

Include quote tokens in more opportunity structs

6369a17

Refactor js sdk

388dbdc

Uuid -> OpportunityId

e025041

danimhr reviewed Jan 17, 2025

View reviewed changes

anihamde reviewed Jan 17, 2025

View reviewed changes

m30m added 6 commits January 17, 2025 08:08

fix1

fdada5a

Reorder errors and use const pubkey

e2658c0

Remove quote tokens field

2d759ad

more fix

f6ef525

Refactor and check token programs

18e0013

Include router ta in permission

fc55a92

anihamde approved these changes Jan 17, 2025

View reviewed changes

m30m added 2 commits January 17, 2025 11:42

Fix input/output to sell/buy token mapping

df59506

nit

f71b577

m30m merged commit 7ef0af8 into main Jan 17, 2025
1 check passed

m30m deleted the swap-js-integration branch January 17, 2025 16:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Swap js integration #320

feat: Swap js integration #320

m30m commented Jan 10, 2025

m30m Jan 10, 2025

danimhr left a comment

danimhr Jan 10, 2025

danimhr Jan 10, 2025

anihamde Jan 10, 2025

anihamde Jan 10, 2025

anihamde Jan 10, 2025

anihamde Jan 10, 2025

anihamde Jan 10, 2025

m30m Jan 16, 2025

danimhr Jan 10, 2025

danimhr Jan 10, 2025

danimhr Jan 10, 2025

danimhr Jan 15, 2025

anihamde Jan 17, 2025

anihamde Jan 17, 2025

anihamde Jan 17, 2025

m30m Jan 17, 2025

anihamde Jan 17, 2025

		impl<T: ChainType> Service<T> {
		pub async fn get_opportunity_by_id(

feat: Swap js integration #320

feat: Swap js integration #320

Conversation

m30m commented Jan 10, 2025

Choose a reason for hiding this comment

danimhr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment